Made small fixes for identity code like in github