Fix static declarations