some fixes before breakfast