tidy up xam solution

Just some build fixes while looking into a testing issue