Small fixes for Phalanx