Fixing some little things in post of 3.0.0