Fix some error and nits