Minor bug-fixes.
Other half of failed data readings fix.