Cleanup: Prevented ClassCastExceptions on public actions with external links