Some small fixes, please review.