Fixes to previous (sloppy) commit