Update with wpilib fixes