Miscellaneous processing tweaks