Fixes to core.c and main.c