Iron out more bugs