Few Phoenix Fixs/cleanup

tested with both classic and phoenix 3.0.1dev76577