Form/admin fixes for model inheritance