Fixes to previous commit

:)