Smaller Fixes!

Signed-off-by: Karthik Nayak <karthik.188@gmail.com>