Small fixes to solve warnings