Arun Sood's Bugfixes