another build bug fixes