Small fixes

Also clean up liniter warnings