Minor fixes and testing with ubuntu.