Fix for entity getters and setters