Some more fixes and two missing files