These two changes fix some warnings that were being fired, can be done in a different patch but they were annoying.