More tweaks for raw more