Further compilation fixes
Work towards auto, away from void