Fix some bugs

Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>