Fix relations + returns