Fix guard + updates gems