Small fixes while reviewing