more fixes to manifest after validation