Fixing silly segueing issues