Bugfix for empty feeds; misc fiddlings