fix assumptions that cause breakage

Fix breakage on Fedoras
Also fixes #11