More manifest fixes