Install related small bug fixes