Some of fixes