Fixed some minor issues. IMHO it's OK for master.