Couple minor dings still work properly