Fix build procedure