Fix issue with _ variables
Fix issues parsing library and module definitions