adding patches for miscellaneous tweakage