fixes to actually make a catalog compile