Minor changes & removing some compiler warnings