Fix some gem inclusion issues