Fuji X100 / Canon S120

Minor fixes/additions...