Consistency improvement, warning fixes