forgotten commits

there is a string of fixes that were left out