Fixed some troubles