Declaration Fixes