Fixing somethings...