Bug fixes -- resolve a deadlock, parser fix, etc