0.1-3: Fixes for building on EL6