Trying to make it work again in linux with llvm 3.3
Boostrap: some fixes