Fixed additional quality issues