Fixed both issues.