noexcept fixes