Small fixies for tablets
fixing conflict