Few more bug fixes