Build 242 fixes