Enable cmdline options and add missing cmdline code from Bricked