A couple more bug fixes