Fixing more compile errors

- Only the accumulators compile error remains