Fixed fluid issues