Fixed a few reported issues
Fixed so third part libs can be included but unexpanded