Fixed more build bugs discovered with all field types.