Follow up commit

Some changes were not committed last time for some odd reason