Minor fixes for first iteraton.