HTC fixes (full only)