strict warning fixes