Delta code now compiles, fixes