Little fixes added