Small fixes for some topics