Fix donation related bugs