makes stuff compile, addresses PR feedback