Fixes for small errors in last commit