Fix unreleased bugs