get back app selector and fix build errors