small tweaks to fix errors (api changes, updated gems)