Some little fixes in the interface
Fixes the floating point exception issue