fixes of nightly mistakes :]