Some fixes of positioning