tiny fixes at Runtime