Pre-submission bugfixes