More fixes for last blog post