More fixes that address #30