Miscellaneous Patches - seabee-rvn