Fix Ubuntu build; cleaner wscript