Small changes to various things, I don't really remember