Few fixes to get Shredder to build and run properly