Some few bugs fixed