Beauty-fixes