Minor compile repairs