Temporary warning fixes