Quick bug fixes before next release