Minor corrections to the first version setup