Push style fixes and rebuild

(This is kind of sloppy.)