Squashing previous corrections into one commit