Fixed thumb block caching and a couple of things that were missed in branching.