Import fixes
Merge pull request #1 from dchaplinsky/master

Import fixes