#70, #69, #68, #59, #40	

All trivial fixes.