Bug fixes to sat selection