Fixes to how updates are discovered and included, fixes #313