Bugfixes for issues introduced with options