Fixes/gem independency