#238 Small fixes