Committing a few fixes