Fixed some building issues