Fix minor bugs. Checkin missing file