more fixes, seems to work on my ubuntu installation now