Various fixes (optimized for HB superheavy)