Minor changes to solve warnings