Additional libraries

This should all be portable now.