some fixes for the paradise build