* Various fixes for server and client side use of architect in NC.

@fjakobs @lennartcl