Fixes to last commit