fixes to pub model