Small changes which should have no impact on existing code