Adds fixes to make `samples' project to work properly