Use SI convention for kg

Fixes #1362