More tweaks for 384/384 settings