- Added some handlers to allow for python2 (int vs float)
- Added a forgotten default in a def line.