Fixes to make another project work