Fix extra bugs