Fix Street calculations