Small Supporting Class Library Changes