made stuff compile and tests run green again