My fixes for Mangosone database/server