Iron out a few more bugs