2 bug fixes for master