warnings: more fixes.