platform related fixes.