Fix statuses and sourcing correct files