Cleaned up obvious compile errors in SupportLib.