Fix issues with commit that Pablo found