Last fixes... I hope