Fixes to Gold Block