Some litle fixes