Small fixes to make available with Phaidra.