Miscellaneous little changes