Fixes for num