Other completion exceptions + small fixes

I'll consolidate the next set of features into one PR, but for now this should eliminate any exceptions seen.