Fixes for Options-Framework. Being merged in shortly to their master branch.