fix building issues