Makes minor changes to clear up warnings.