fixes to related