Patches for our environment