put fixes in own package