couple more bug fixes