Fixed SCI-1395 using new reset axes call
Removed compiler warnings