quick fix

Added some fixes from the last update