Small fixes for previous commit