EXT1008: Some bug fixes