Re-done release bug fixes