Fixes a few glitches while trying to test integration. #3.