Better checks for external constraints