Fixes for imx
Merge pull request #25 from rmtmckenzie/Morgan

Fixes for imx