fixed some issues so I can use this in a relx based build