Overflow issues with bones fixed