Small changes to fix Linux build