Minor fixes that were needed