More fixes related to #43