Fix failing build, add imports