Fix entry functions