Miscellaneous changes per review