some small code fixes that never were meant to be committed