Fixing Aardvark targets