removed conversion and typedef issues