dogtags + pushboat fixes

dogtags + pushboat fixes