Fix GCC build issues
Remove some test code
Fix memory corrution in comb gen