Library Resources - Misc Fixes