build + style fixes