Curtain some frontend bugs