Changes made to be a bit more compatible with other libraries