Fix issues with abstract models