Fixes: Bugs on both pillar island and gate island