Lolipop Changes

Some changes for Lolipop