Take care of some warnings I missed