Small fixes

! Compiler warnings etc.