Some fixes in phi0588