#92 #79 tiny fixes