Adding a few fixes