Minor "fixes", still a lot of consistency issues to go through
(y)