Fixes suggested by Matthias and Viola (binnings etc.)