Fixing some bugs, regarding XLS import