Miscellaneous fixes
Merge branch 'devel' of github.com:01org/tlm into devel