Some more fixes, but get stucked