some fixes with building