Framework Bug Fixes