Ugh! Issues hopefully fixed