Feature switch tweak