Little polish things, mostly not spewing out errors at the null row at the end.