Some more fixees!!!