Fixed another couple of bugs