Follow the same standard for all entities.

Add the @Override annotation above all getEntity() methods (except for the one in CanaryEntity).
Fix some issues with some entities.