Fixing declarations