Internal fixes