Fix some warnings and a small cleanup

--HG--
branch : slg3.5_startup