Miscelleaneous small changes