Few codes fixes