various fixes in FrontEnd