SMall changes to remove compiler warnings