Library cs fixes
Merge pull request #256 from GrahamCampbell/library-cs-fixes

Library CS Fixes