Reverted accidental commit + actually fixed compile errors.