bug fixes in framework