Fixes for relations