Miscellaneous modifications