fixes for options