Small fix to resolve some missed issues