Build fixes and google plus login