fixes + safer checks for shiny completions