First wave of bug fixes