Fixes that weren't commited