Minor updates to remove some warnings