WIP - unbreak sample building