Fix non-fatal warnings