Fix annotation craziness