Committing small fixes