Fix map issues. Missing script, etc