Even more smaller nitpicks