Fixes to latest commit