Fixes some consistency issues pointed out on github