fixes to phase classes