Doing some bug fixing while testing units.