Some more fixes and improvements

Signed-off-by: Prashanth Pai <ppai@redhat.com>