Additional fixes related to phases