Compile fixes for phase system