Fixed some conservative advancement bugs