Miscellaneous updates that didn't take