Attempt to fix some warnings