Clean up imports, other compiler warnings