Minor override changes