Non-blueprint fixes.