Made skill build loading more robust