Just patching some stuff