Engine selection fixes