Some more fixs