Fixed builds under unix