[hobbit] post-RC3 patch problems