Build fixes for new stderr wrapper