Minor changes to satisfy bluong