Few more bugs fixed.