Fiend tweaks and fixes...