Fixed issues in nightlies