Compile warnings again

This fixes some of the remaining compile warnings after @xhaggi  's PR.