Miscellaneous updates
Include deletes