Various frontend stability improvements