9C specific tweaks