Fixing errors in last push