Some stupid fixes