Build files fixes