Fixed a few code syntax related issues