Fixed a few errors with the last beta release...