Some more fixex