Add more terms to robot abbreviations
Fix warning in calc module