Fix relationships and forms