SLING-4012, fix imports