fixed some building issues