Little fixes for previous commit