Starting server engine, updates for 0.13 PR merge.