Fixes and nits