some more little fixies...