Minor fixes for importing related entities