Fixes (#2)