Small reference/Form API changes