Fixed any minor issues on import