Killed off some warnings