Fixed issues in SelectFromModel