Further changes

@osgl Could you check thisone and include it to the release