Miscellaneous improvements