Fixes (#28)