Minor style fixups