Minor utilities and fixes