Fixed Bugs (WormHole etc)