Fixes setup, including commit