More build exception work-arounds..