Fixes for integration problems back into Flux
Renaming building methods