Updates to various miscellaneous functions