Some small changes to make boxen work better