Fixed some traps