Miscellaneous fixing

CL 249564, CL 249562, CL 249563