Fix compilation errors and add old heap adjustment after gc