Further bugfixes; preparing RC1