Squash out bugs in latest import