Issue 567

Fixed issues with the update manager