Fixes to prevent lint/kompile warnings.