Fixed some last things to make it all work again.