A few improvements

Some fixes with compilation prefix & a few other minor improvements.