[*] Fixed a couple bugs