Fixed compiler errors from latest compiler update.