Changes for building from source (1/2)