Couple of tweaks for frontend stuff