Pull bugfixes from common