Fixes to last commit
More fixes