Fix some warnings and stuff