various changes to make the fscker build