Fix issues on paradise