Fixed some framework problems