Fix variables in manifest