More bug fixing with CarPark