Few more small tweaks, forgot to update a config value and fixed some
incorrect Perl object references.