Removed some warnings about extra semi-colons