Minor bugfixes for the second release