Fixes that went into angular