Fixing some changes that didn't get commited yesterrday