Fixing Core -> Base linting warning/errors