Framer Bug fixes by Yashraj Vaghela