Fixes options handling