SolutionGuarantor: some minor fixes for compilation
Blocks and Cores now function as designed