Fix: minor bug fixes after update

Signed-off-by: Aniket Pant <me@aniketpant.com>