Minor changes to correct compilation errors