Clean up 0-prefixed integers to avoid warnings