Quick hack to unbreak updates and target checking.

This needs a proper fix.