Fix probing related issues