Small tweaks so we can add a hacked version of custom annotations