Small changes, squash this commit