Rearranging and fixing build