Small beauty fixes