build: code cosmetics
build: fix build on os x