Comments and warning fixes