some Choices fixes