minor fixes in int/double handling