Minor clean-up work (warnings in IDE)