Some small changes..