Committing my fixes