Various bugfixes for final release push.