Bugfixes for Lustre input