more fixes for frontend