Additional bug fixes and build logic.