First wave of fixing all small bugs.