Still chasing down marc8 bugs