Added code to get rid of some undeclared/uninit warnings