Some "minor" improvements here and there

See commits :D