Some litle tweaks