Improve paths, continue hostSuppr work