Some fixes in 2.1.0 preview post (es)