Fix bugs

Signed-off-by: onni@laptop <ze0nni@gmail.com>