Fixes for previous version. No other changes.