Frameworks Base: More fixes