Fixed some entity view generation stuff