Minor corrections to fix code warnings