Completion geometry fixes