Fixing method overrides and object constness