A few fixes for some my old commits