Bug fixes scheme creation/deleting