Fix Declarations