Dev Fixed some bugs reported by @seracom.