Revert year changing and fix compilation error