Updated delegate for 2.3.2 and cleaned up inconsistencies