Fizing some little bugs