Try to fix jwerty support
Move jwerty references out of master