Patches. some code patches.