Thanks Jason - there was no update to EM showing in the CC desktop app, but I downloaded it from the adobe site and its working now.
One thing still though, which I've had before and never really figured out, and have it again now is that when I go to create the database pages using WA > Database > Database Pages I am getting an error about No tables found. Your database or site testing server settings may not be configured properly.
It seems fine most of the time, but does this from time to time and I never know why, as all the settings appear to be OK, and I can upload normally.
Any ideas where I might look to fix this?