some small fixes

This fixes two small problems I came across when trying out the master branch.