Basel changes

another bunch of non-critical changes