Adapt version ranges.
Fix couple of warnings while at it.

Change-Id: I6b9cc52df72befbddad87350ffe230915dc0b406
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
(cherry picked from commit aa2989ef9070ece3bb9658fff18b9970f9341cf2)