Some little tweaks
Merged with conflict
Fixed another conflict