Fixes (updates #100)