More stlying fixes