Removed more C comp. warnings