Fix build on Raring
Improve support for Mutracx dev environment