Minor changes to VehicleModel and PictureModel