Fix a couple small completion bugs