Small fixes to frontend