Fixes a few mistakes in last push