Small changes commit to be able to do a merge