Fixing hw options