some fixes from last update