Closed a few more bugs