Fixed some issues raised by pullreview.com.