Fix problems with eval-after-load