Last fixes sprint10