Various untested changes, do not use yet