Fixes to previous commit