Fix problem with warnings