fixed stuff to run under Ubuntu