Reduced number of unwanted warnings.
Added support for fallbacks for #7.