Bug fixes and framework code sync