OpenContracting-specific improvements

Pull request against `opencontracting` branch