Alternatives bug fixes