Further adjusments to manifest