Tiny bug fixes. The next commit is going to be a big one, so don't bother with this unless you already have Glaukaba installed.