Miscellaneous work

Item 2