Bufixes on relation output