Bandwidth and Context Mapping, minor fixes