Bug and format fixes.