Fixing a couple of framework issues