Adding a few more fixes