Fixed some declarational errors