[phoenix] Various fixes