Fixes to make it runnable, use ContextBuilder
  * this time for real