More general fixes (still not working yet)