Fixed some minor functions in Entities