micro related fixes