More madlib fixes