Pushing some more fixes