More changes. Believe it!

Change-Id: Ib9348d0f084129162c702247ffb0cfc20bb29d09
Signed-off-by: Paul Duncan <paul.shauna@gmail.com>