- build fixes
- style fixes as proposed by `vurdalak`