Fixing all relations and stufs