Couple more bug fixes