warning fixes here and there