Fix some declarations