Catalina update issues

Author: Kristofvde