Minor fixes

Some minor fixes related to #5.