Fixes w/ scott