small fixes reported by fillius-tilmond