real fixes from last commit