General Fixes

...braries

and other things.