Some more small improvement that were missed in the previous commit