Minor fixes for compleetion and clean up