Change some display issues in nightly build