Some more fixed