Better int parsing