Small changes to fix compile. Still very much not done