Fixes a few function annotations