Cut down on some warnings