Fixes for frontend.