fixes for suggestions