Minor corrections to main framework classes