Fixed some issues with number types.