Few things for #55