More removegrain fixes