Additional Frontend Fixes