More frontendy fixes