fixes to make last commit work