Little fixes at startup