Frameworks Base: Fix build errors