Micro bug-fixes