Few more bug fixes.