Final bug fixes before release

@stowellm 
mContext could fit on the line above