Resolve some compilation issues