Minor changes

Changes made to code for type compatibility reasons.