Lates minor modifications