Fix more functionality