More fixes toward resolving #1