Fix standalone comments, disable two tests, other fixes