Miscellaneous small changes