Moved stuff from install to before_install