Fixed a couple of remaining bugs