micro-fixes