Front end performance tweeks