Rupen Melkisetoglu bug fixes.