Almost Last buildfix