some some fixes for night builds