Fixed a few options to run properly