Get rid of warnings and fix small bugs