Some minor changes to fix the compile problem