Added a couple of small fixed before the real work starts