phoromatic: Couple fixes/improvements