First fixes (so it runs)