Front end legacy fixes