Batch of latest bug-fixes