fixes for frontend