Cleaned up the "fixed fields".Fixes #95