Changes to make it compile, missed previously