Changes to make compatible with Ubuntu