Fixes for 2013 WPILib