Fix entry points