Fixes for several submissions