common fixes (#19 related)