Fixes for handling weight correctly and not updating too often