fixed building issues