sug fixes