Update for compiler library changes