Fixes autoloading and weight unit bug

Fixes autoloading and weight unit bug