Additional Settings fixes