Fix trickroom bugs