Some another issues resolved)