Bug fixes (First round)