Improvements to importing specs
Misc. bug fixes in importing specs