Fix another bunch of warnings + 1 bug!