Fix more of the WIP code