manifest and setp fixes