Minor fixes to frontend