Debug same errors
 Small changes