Alpha 14 fixes