Rework some stuff to lay future ground for building broken ports
Updated to work with new default user build