[code] some tiny fixes here and there