Fix core domain properties