Make fields final.
Push changes to test on Windows.