Solving a couple of bugs.