Minor updates to clear up some warnings