fix remaining bugs due to updated gems