Adding a couple more fixes