Fix more warnings

I've fixed some more warnings that xcode complained about. Please include them. Thanks!