Fix garbage-less build