Fix some warnings

Just some various warning fixes.