pagoda fixes