Local unfinished fixes to repo