Miscellaneous bits to make things easier, hopefully