Hook call fixes