Remove old import, minor compile fixes.