Merge: production & devel

Fixed another couple of silly mistakes.