Updated build of Contecxt and Serge Apps