Fix mark-complete issues, hopefully permanently