Simple fixes
Remove warnings