More code consistency, fix targeting bug.