Some cosmetic changes towards 'WIN32' support

Signed-off-by: Harshavardhana <fharshav@redhat.com>