Fixes for Frontend