Trap: Clean up some warnings