Frontend fixes and some other fixes