A couple of changes on top of projectkkglider branch